diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-11 12:58:31 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-11 12:58:31 +0200 |
| commit | 3242bda1a653269cafbdd310fe422f661c95153f (patch) | |
| tree | b9eecc2998bdfefb3174e368ec49ebdb6a860611 | |
| parent | 79c6c9116bdeaf3dc7fffbeb6a6412bb8d6e35f0 (diff) | |
| parent | 6d9bca0380bcab758d96e1bcb58fa6e2f9ef1c19 (diff) | |
| download | Chimère - projet Saclay-3242bda1a653269cafbdd310fe422f661c95153f.tar.bz2 Chimère - projet Saclay-3242bda1a653269cafbdd310fe422f661c95153f.zip | |
Merge branch 'master-v3.0' into saclay-v3.0
| -rw-r--r-- | static/saclay/css/styles.css | 2 | ||||
| -rw-r--r-- | templates/chimere/detail.html | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css index e53f484..cacda9c 100644 --- a/static/saclay/css/styles.css +++ b/static/saclay/css/styles.css @@ -949,6 +949,7 @@ ul#action{ background-repeat:no-repeat; } +/* #action-categories.category-selected label{ background-image:url(../images/check-active.png) ; background-repeat:no-repeat; @@ -963,6 +964,7 @@ ul#action{ #action-categories.category-selected label{ background-position:right center; } +*/ #main-map{ top:26px; diff --git a/templates/chimere/detail.html b/templates/chimere/detail.html index 16aa833..e106115 100644 --- a/templates/chimere/detail.html +++ b/templates/chimere/detail.html @@ -34,9 +34,9 @@ <div id='detail_footer'> <div id='detail-action-bar'> {%if routing_enabled%}<a class='detail_from' href='#'>{% trans "From" context "routing" %}</a> + | <a class='detail_step' href='#'>{% trans "Add step" context "routing" %}</a> | <a class='detail_to' href='#'>{% trans "To" context "routing" %}</a> - | {% endif %}<a class='detail_zoomin' href='#'>{% trans "Zoom in" %}</a> - | <a class='detail_zoomout' href='#'>{% trans "Zoom out" %}</a> + {% endif %} </div> <ul class='share'> <li><a href="{{modif_by_email}}">{% trans "Propose a modification" %}</a></li> |